From 4faa361b74f156b47bde0ccf18568f8a075086dc Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 21 Jul 2004 16:53:55 +0000 Subject: [PATCH] Use the new text target functionality in GtkTargetList instead of 2004-07-21 Matthias Clasen * gtk/gtkcalendar.c: Use the new text target functionality in GtkTargetList instead of hardcoding a subset of text targets. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkcalendar.c | 20 ++++---------------- 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index d28d22ef8f..8a652b95db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-07-21 Matthias Clasen + + * gtk/gtkcalendar.c: Use the new text target functionality + in GtkTargetList instead of hardcoding a subset of text targets. + Tue Jul 20 23:11:23 2004 Matthias Clasen * gdk/x11/gdkevents-x11.c: Hook up gtk-menu-bar-accel to diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d28d22ef8f..8a652b95db 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-07-21 Matthias Clasen + + * gtk/gtkcalendar.c: Use the new text target functionality + in GtkTargetList instead of hardcoding a subset of text targets. + Tue Jul 20 23:11:23 2004 Matthias Clasen * gdk/x11/gdkevents-x11.c: Hook up gtk-menu-bar-accel to diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d28d22ef8f..8a652b95db 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-07-21 Matthias Clasen + + * gtk/gtkcalendar.c: Use the new text target functionality + in GtkTargetList instead of hardcoding a subset of text targets. + Tue Jul 20 23:11:23 2004 Matthias Clasen * gdk/x11/gdkevents-x11.c: Hook up gtk-menu-bar-accel to diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d28d22ef8f..8a652b95db 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-07-21 Matthias Clasen + + * gtk/gtkcalendar.c: Use the new text target functionality + in GtkTargetList instead of hardcoding a subset of text targets. + Tue Jul 20 23:11:23 2004 Matthias Clasen * gdk/x11/gdkevents-x11.c: Hook up gtk-menu-bar-accel to diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c index 0082752a6f..88afc9b8de 100644 --- a/gtk/gtkcalendar.c +++ b/gtk/gtkcalendar.c @@ -600,17 +600,6 @@ gtk_calendar_class_init (GtkCalendarClass *class) G_TYPE_NONE, 0); } -enum -{ - TARGET_TEXT -}; - -static const GtkTargetEntry target_table[] = { - { "TEXT", 0, TARGET_TEXT }, - { "STRING", 0, TARGET_TEXT }, - { "UTF8_STRING", 0, TARGET_TEXT } -}; - static void gtk_calendar_init (GtkCalendar *calendar) { @@ -693,10 +682,8 @@ gtk_calendar_init (GtkCalendar *calendar) private_data->in_drag = 0; private_data->drag_highlight = 0; - gtk_drag_dest_set (widget, - 0, - target_table, G_N_ELEMENTS (target_table), - GDK_ACTION_COPY); + gtk_drag_dest_set (widget, 0, NULL, 0, GDK_ACTION_COPY); + gtk_drag_dest_add_text_targets (widget); private_data->year_before = 0; @@ -2824,7 +2811,8 @@ gtk_calendar_motion_notify (GtkWidget *widget, event->x, event->y)) { GdkDragContext *context; - GtkTargetList *target_list = gtk_target_list_new (target_table, G_N_ELEMENTS (target_table)); + GtkTargetList *target_list = gtk_target_list_new (NULL, 0); + gtk_target_list_add_text_targets (target_list); context = gtk_drag_begin (widget, target_list, GDK_ACTION_COPY, 1, (GdkEvent *)event); -- 2.30.2